Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 8 Aug 2010 23:59:58 +0000 (23:59 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 8 Aug 2010 23:59:58 +0000 (23:59 +0000)
commit9667564d7ac8b6206c36c221240489a59dba7047
tree0877ffe53420f8f269eb9fd0242e40d2b579a7c7
parentea6a4ab23da012d22e91c27c12b86c39531e8b8d
parent6d6dc1941b74dba0b99afc8b54b88a0088982f17
Merge from mainline.